
<!DOCTYPE HTML>
<html lang="zh-hans" >
    <head>
        <meta charset="UTF-8">
        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
        <title>分支策略 · 雪之梦</title>
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <meta name="description" content="">
        <meta name="generator" content="GitBook 3.2.3">
        <meta name="author" content="xinwuyun">
        
        
    
    
    <link rel="stylesheet" href="../../gitbook/style.css">

    
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-search-plus/search.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-splitter/splitter.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-expandable-chapters-small/expandable-chapters-small.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-anchor-navigation-ex/style/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-code/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-advanced-emoji/emoji-website.css">
                
            
                
                <link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-donate/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-icp/footer.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-mermaid-gb3/mermaid/mermaid.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-highlight/website.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-fontsettings/website.css">
                
            
        

    

    
        
    
        
    
        
    
        
    
        
    
        
    


    

        
    
    
    
    
    
    
    <meta name="HandheldFriendly" content="true"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../../gitbook/images/apple-touch-icon-precomposed-152.png">
    <link rel="shortcut icon" href="../../gitbook/images/favicon.ico" type="image/x-icon">

    
    <link rel="next" href="branch-emergency-fixbug.html" />
    
    
    <link rel="prev" href="branch-merge-with-conflict.html" />
    

    <link href="https://xinwuyun.github.io/rss" title="雪之梦" rel="alternate" type="application/rss+xml" />

    <style>
    @media only screen and (max-width: 640px) {
        .book-header .hidden-mobile {
            display: none;
        }
    }
    </style>
    <script>
        window["gitbook-plugin-github-buttons"] = {"buttons":[{"user":"xinwuyun","repo":"xinwuyun.github.io","type":"star","size":"small"}]};
    </script>

    
        <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
    
    
    
    
        <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/apple-touch-icon-precomposed-152.png">
    
    
        
    
    
        
    

    
    <link rel="stylesheet" href="../../gitbook/gitbook-plugin-chart/c3/c3.min.css">
    <script src="../../gitbook/gitbook-plugin-chart/c3/d3.min.js"></script>
    <script src="../../gitbook/gitbook-plugin-chart/c3/c3.min.js"></script>
    

    </head>
    <body>
        
<div class="book">
    <div class="book-summary">
        
            
<div id="book-search-input" role="search">
    <input type="text" placeholder="输入并搜索" />
</div>

            
                <nav role="navigation">
                


<ul class="summary">
    
    
    
        
        <li>
            <a href="https://blog.xinwuyun.cn/" target="_blank" class="custom-link">技术博客</a>
        </li>
    
    

    
    <li class="divider"></li>
    

    
        
        
    
        <li class="chapter " data-level="1.1" data-path="../../">
            
                <a href="../../">
            
                    
                    简介
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">入门教程</li>
        
        
    
        <li class="chapter " data-level="2.1" data-path="../../markdown/">
            
                <a href="../../markdown/">
            
                    
                    markdown 入门教程
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2" data-path="../">
            
                <a href="../">
            
                    
                    git 入门教程
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.1" data-path="../base/about.html">
            
                <a href="../base/about.html">
            
                    
                    初识 git
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.1.1" data-path="../base/install.html">
            
                <a href="../base/install.html">
            
                    
                    安装 git
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.1.2" data-path="../base/config.html">
            
                <a href="../base/config.html">
            
                    
                    配置 git
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.2.2" data-path="about.html">
            
                <a href="about.html">
            
                    
                    实战 git
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.2.1" data-path="local-repository.html">
            
                <a href="local-repository.html">
            
                    
                    本地仓库
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.2" data-path="version-manage.html">
            
                <a href="version-manage.html">
            
                    
                    版本管理
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.3" data-path="reset.html">
            
                <a href="reset.html">
            
                    
                    回到过去
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.4" data-path="concept.html">
            
                <a href="concept.html">
            
                    
                    基本概念
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.5" data-path="version-control.html">
            
                <a href="version-control.html">
            
                    
                    版本控制
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.6" data-path="checkout-reset.html">
            
                <a href="checkout-reset.html">
            
                    
                    撤销更改
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.7" data-path="delete.html">
            
                <a href="delete.html">
            
                    
                    删除文件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.8" data-path="remote-repository.html">
            
                <a href="remote-repository.html">
            
                    
                    远程仓库
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.9" data-path="branch-manage.html">
            
                <a href="branch-manage.html">
            
                    
                    分支管理
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.2.9.1" data-path="branch-overview.html">
            
                <a href="branch-overview.html">
            
                    
                    分支总览
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.9.2" data-path="branch-merge-with-conflict.html">
            
                <a href="branch-merge-with-conflict.html">
            
                    
                    冲突合并
            
                </a>
            

            
        </li>
    
        <li class="chapter active" data-level="2.2.2.9.3" data-path="branch-strategy.html">
            
                <a href="branch-strategy.html">
            
                    
                    分支策略
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.9.4" data-path="branch-emergency-fixbug.html">
            
                <a href="branch-emergency-fixbug.html">
            
                    
                    紧急修复
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.9.5" data-path="branch-rebase.html">
            
                <a href="branch-rebase.html">
            
                    
                    变基合并
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.9.6" data-path="branch-remote.html">
            
                <a href="branch-remote.html">
            
                    
                    协同开发
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.2.9.7" data-path="local-remote-repository.html">
            
                <a href="local-remote-repository.html">
            
                    
                    本地和远程仓库的本质
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.2.2.10" data-path="tag.html">
            
                <a href="tag.html">
            
                    
                    里程碑式标签
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.2.3" data-path="../custom/about.html">
            
                <a href="../custom/about.html">
            
                    
                    私人定制
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.3.1" data-path="../custom/ignore.html">
            
                <a href="../custom/ignore.html">
            
                    
                    忽略文件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.3.2" data-path="../custom/sync-remote-repo.html">
            
                <a href="../custom/sync-remote-repo.html">
            
                    
                    同步推送多Git仓库
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.2.4" data-path="../server/private.html">
            
                <a href="../server/private.html">
            
                    
                    搭建私服
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5" data-path="../tools/about.html">
            
                <a href="../tools/about.html">
            
                    
                    扩展工具
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.5.1" data-path="../tools/git-bash-command.html">
            
                <a href="../tools/git-bash-command.html">
            
                    
                    git bash 常见命令
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5.2" data-path="../tools/git-bash-relationship.html">
            
                <a href="../tools/git-bash-relationship.html">
            
                    
                    git bash 朋友圈
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5.3" data-path="../tools/git-bash-tree.html">
            
                <a href="../tools/git-bash-tree.html">
            
                    
                    git bash 扩展tree命令
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5.4" data-path="../tools/git-bash-extend-up.html">
            
                <a href="../tools/git-bash-extend-up.html">
            
                    
                    git bash 扩展命令(上)
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5.5" data-path="../tools/git-bash-extend-middle.html">
            
                <a href="../tools/git-bash-extend-middle.html">
            
                    
                    git bash 扩展命令(中)
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5.6" data-path="../tools/git-bash-extend-down.html">
            
                <a href="../tools/git-bash-extend-down.html">
            
                    
                    git bash 扩展命令(下)
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.5.7" data-path="../tools/git-submodule-quickstart.html">
            
                <a href="../tools/git-submodule-quickstart.html">
            
                    
                    git submodule 父子模块
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.2.6" data-path="../summary/about.html">
            
                <a href="../summary/about.html">
            
                    
                    沙海拾贝
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.2.6.1" data-path="../summary/common.html">
            
                <a href="../summary/common.html">
            
                    
                    知识速查
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.2.6.2" data-path="../summary/cheatsheet-translation.html">
            
                <a href="../summary/cheatsheet-translation.html">
            
                    
                    备忘录[译]
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.3" data-path="../../github/">
            
                <a href="../../github/">
            
                    
                    github 入门教程
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.3.1" data-path="../../github/speedup.html">
            
                <a href="../../github/speedup.html">
            
                    
                    github 访问速度太慢
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.3.2" data-path="../../github/badge.html">
            
                <a href="../../github/badge.html">
            
                    
                    github 徽章从何而来
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.4" data-path="../../myGitbook/">
            
                <a href="../../myGitbook/">
            
                    
                    gitbook 入门教程
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.4.1" data-path="../../myGitbook/preparation/prepare.html">
            
                <a href="../../myGitbook/preparation/prepare.html">
            
                    
                    准备阶段
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.4.1.1" data-path="../../myGitbook/preparation/front-knowledge.html">
            
                <a href="../../myGitbook/preparation/front-knowledge.html">
            
                    
                    前置知识
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.1.2" data-path="../../myGitbook/preparation/environmental-requirements.html">
            
                <a href="../../myGitbook/preparation/environmental-requirements.html">
            
                    
                    环境要求
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.4.2" data-path="../../myGitbook/experience/preview.html">
            
                <a href="../../myGitbook/experience/preview.html">
            
                    
                    快速体验
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.4.2.1" data-path="../../myGitbook/experience/gitbook-cli.html">
            
                <a href="../../myGitbook/experience/gitbook-cli.html">
            
                    
                    gitbook-cli 命令行操作
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.2.2" data-path="../../myGitbook/experience/gitbook-editor.html">
            
                <a href="../../myGitbook/experience/gitbook-editor.html">
            
                    
                    gitbook-editor 编辑器操作
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.2.3" data-path="../../myGitbook/experience/gitbook-com.html">
            
                <a href="../../myGitbook/experience/gitbook-com.html">
            
                    
                    gitbook.com 官网操作
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.4.3" data-path="../../myGitbook/advance/advance.html">
            
                <a href="../../myGitbook/advance/advance.html">
            
                    
                    高级进阶
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.4.3.1" data-path="../../myGitbook/advance/plugin.html">
            
                <a href="../../myGitbook/advance/plugin.html">
            
                    
                    插件介绍
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.4.3.1.1" data-path="../../myGitbook/advance/plugin-practical.html">
            
                <a href="../../myGitbook/advance/plugin-practical.html">
            
                    
                    实用插件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.3.1.2" data-path="../../myGitbook/advance/plugin-theme.html">
            
                <a href="../../myGitbook/advance/plugin-theme.html">
            
                    
                    主题插件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.3.1.3" data-path="../../myGitbook/advance/plugin-develop.html">
            
                <a href="../../myGitbook/advance/plugin-develop.html">
            
                    
                    开发插件
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.4.3.2" data-path="../../myGitbook/advance/export.html">
            
                <a href="../../myGitbook/advance/export.html">
            
                    
                    导出电子书
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.3.3" data-path="../../myGitbook/advance/publish.html">
            
                <a href="../../myGitbook/advance/publish.html">
            
                    
                    发布电子书
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.4.4" data-path="../../myGitbook/openwrite/">
            
                <a href="../../myGitbook/openwrite/">
            
                    
                    公众号引流
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.5" data-path="../../myGitbook/seo/">
            
                <a href="../../myGitbook/seo/">
            
                    
                    优化搜索
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.6" data-path="../../myGitbook/issue/">
            
                <a href="../../myGitbook/issue/">
            
                    
                    常见问题
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="2.4.6.1" data-path="../../myGitbook/issue/rm-output-directory.html">
            
                <a href="../../myGitbook/issue/rm-output-directory.html">
            
                    
                    热加载失败治标之法
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="2.4.6.2" data-path="../../myGitbook/issue/modify-default-fold.html">
            
                <a href="../../myGitbook/issue/modify-default-fold.html">
            
                    
                    初始化默认折叠效果
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="2.4.7" data-path="../../myGitbook/reference/">
            
                <a href="../../myGitbook/reference/">
            
                    
                    参考更多
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    

    
        
        <li class="header">编程笔记</li>
        
        
    
        <li class="chapter " data-level="3.1" >
            
                <a target="_blank" href="https://xinwuyun.github.io/learn-java/">
            
                    
                    java 学习笔记
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="3.2" >
            
                <a target="_blank" href="https://xinwuyun.github.io/learn-go/">
            
                    
                    go 学习笔记
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="3.3" >
            
                <a target="_blank" href="https://xinwuyun.github.io/learn-php/">
            
                    
                    php 学习笔记
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="3.4" >
            
                <a target="_blank" href="https://xinwuyun.github.io/learn-python/">
            
                    
                    python 学习笔记
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">兴趣开发</li>
        
        
    
        <li class="chapter " data-level="4.1" data-path="../../zero2devops/">
            
                <a href="../../zero2devops/">
            
                    
                    从零开始搭建服务器
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.1.1" data-path="../../zero2devops/login-and-logout.html">
            
                <a href="../../zero2devops/login-and-logout.html">
            
                    
                    从登录服务器开始
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.1.2" data-path="../../zero2devops/docker.html">
            
                <a href="../../zero2devops/docker.html">
            
                    
                    更加优雅地部署项目
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.1.3" data-path="../../zero2devops/docker-get-started.html">
            
                <a href="../../zero2devops/docker-get-started.html">
            
                    
                    跟着官方体验 Docker
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.1.4" data-path="../../zero2devops/docker-example.html">
            
                <a href="../../zero2devops/docker-example.html">
            
                    
                    快速尝鲜基于 Docker 部署项目
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.1.5" data-path="../../zero2devops/aliyun-oss-static.html">
            
                <a href="../../zero2devops/aliyun-oss-static.html">
            
                    
                    利用阿里云 OSS部署静态网站
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.1.6" data-path="../../zero2devops/nginx-https.html">
            
                <a href="../../zero2devops/nginx-https.html">
            
                    
                    免费实现https访问网站
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.1.7" data-path="../../zero2devops/webhook.html">
            
                <a href="../../zero2devops/webhook.html">
            
                    
                    webhook
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.2" data-path="../../devops/">
            
                <a href="../../devops/">
            
                    
                    运维部署
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.2.1" data-path="../../devops/docker-env.html">
            
                <a href="../../devops/docker-env.html">
            
                    
                    docker 环境
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.2" data-path="../../devops/docker-ops.html">
            
                <a href="../../devops/docker-ops.html">
            
                    
                    docker 操作
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.3" data-path="../../devops/docker-compose.html">
            
                <a href="../../devops/docker-compose.html">
            
                    
                    docker compose
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.4" data-path="../../devops/docker-nginx.html">
            
                <a href="../../devops/docker-nginx.html">
            
                    
                    docker + nginx
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.5" data-path="../../devops/docker-blog.html">
            
                <a href="../../devops/docker-blog.html">
            
                    
                    docker + blog
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.6" data-path="../../devops/docker-resume.html">
            
                <a href="../../devops/docker-resume.html">
            
                    
                    docker + resume
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.7" data-path="../../devops/docker-gitbook.html">
            
                <a href="../../devops/docker-gitbook.html">
            
                    
                    docker + gitbook
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.8" data-path="../../devops/docker-bark.html">
            
                <a href="../../devops/docker-bark.html">
            
                    
                    docker + Bark
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.9" data-path="../../devops/docker-py12306.html">
            
                <a href="../../devops/docker-py12306.html">
            
                    
                    docker + py12306
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.10" data-path="../../devops/docker-mojo-Weixin.html">
            
                <a href="../../devops/docker-mojo-Weixin.html">
            
                    
                    docker + mojo-Weixin
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.11" data-path="../../devops/docker-wechat-work-message-push-go.html">
            
                <a href="../../devops/docker-wechat-work-message-push-go.html">
            
                    
                    docker + wechat-work-message-push-go
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.12" data-path="../../devops/docker-email.html">
            
                <a href="../../devops/docker-email.html">
            
                    
                    docker + email
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.13" data-path="../../devops/docker-mysql.html">
            
                <a href="../../devops/docker-mysql.html">
            
                    
                    docker + mysql
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.14" data-path="../../devops/docker-springboot.html">
            
                <a href="../../devops/docker-springboot.html">
            
                    
                    docker + springboot
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.15" data-path="../../devops/docker-redis.html">
            
                <a href="../../devops/docker-redis.html">
            
                    
                    docker + redis
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.16" data-path="../../devops/docker-gogs.html">
            
                <a href="../../devops/docker-gogs.html">
            
                    
                    docker + gogs
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.17" data-path="../../devops/docker-gitlab.html">
            
                <a href="../../devops/docker-gitlab.html">
            
                    
                    docker + gitlab
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.18" data-path="../../devops/docker-gitea.html">
            
                <a href="../../devops/docker-gitea.html">
            
                    
                    docker + gitea
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.19" data-path="../../devops/docker-crawlab.html">
            
                <a href="../../devops/docker-crawlab.html">
            
                    
                    docker + crawlab
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.3" data-path="../../tools/">
            
                <a href="../../tools/">
            
                    
                    工具资源
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.3.1" data-path="../../tools/mac-install-vmware.html">
            
                <a href="../../tools/mac-install-vmware.html">
            
                    
                    给 mac 装个 vmware 虚拟机
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.3.1.1" data-path="../../tools/mac-vmware-install-windows.html">
            
                <a href="../../tools/mac-vmware-install-windows.html">
            
                    
                    给 mac 虚拟机装个 windows
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.1.2" data-path="../../tools/mac-vmware-install-centos.html">
            
                <a href="../../tools/mac-vmware-install-centos.html">
            
                    
                    给 mac 虚拟机装个 centos
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.1.3" data-path="../../tools/mac-vmware-install-ubuntu.html">
            
                <a href="../../tools/mac-vmware-install-ubuntu.html">
            
                    
                    给 mac 虚拟机装个 ubuntu
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.3.2" data-path="../../tools/windows-install-vmware.html">
            
                <a href="../../tools/windows-install-vmware.html">
            
                    
                    给 windows 装个 vmware 虚拟机
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.3.2.1" data-path="../../tools/windows-vmware-install-mac.html">
            
                <a href="../../tools/windows-vmware-install-mac.html">
            
                    
                    给 windows 虚拟机装个 mac
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.2.2" data-path="../../tools/windows-vmware-install-windows.html">
            
                <a href="../../tools/windows-vmware-install-windows.html">
            
                    
                    给 windows 虚拟机装个 windows
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.2.3" data-path="../../tools/windows-vmware-install-centos.html">
            
                <a href="../../tools/windows-vmware-install-centos.html">
            
                    
                    给 windows 虚拟机装个 centos
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.2.4" data-path="../../tools/windows-vmware-install-ubuntu.html">
            
                <a href="../../tools/windows-vmware-install-ubuntu.html">
            
                    
                    给 windows 虚拟机装个 ubuntu
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.3.3" data-path="../../tools/wechat-history-article-backup.html">
            
                <a href="../../tools/wechat-history-article-backup.html">
            
                    
                    公众号历史文章备份
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.3.3.1" data-path="../../tools/wechat-backup-xuezhimengjishuyizhan.html">
            
                <a href="../../tools/wechat-backup-xuezhimengjishuyizhan.html">
            
                    
                    雪之梦技术驿站
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.3.2" data-path="../../tools/wechat-backup-sushengbuhuo.html">
            
                <a href="../../tools/wechat-backup-sushengbuhuo.html">
            
                    
                    苏生不惑
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.3.3" data-path="../../tools/wechat-backup-pythonjishu.html">
            
                <a href="../../tools/wechat-backup-pythonjishu.html">
            
                    
                    Python技术
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.3.4" data-path="../../tools/chrome-extend-learn.html">
            
                <a href="../../tools/chrome-extend-learn.html">
            
                    
                    学会开发专属 chrome 插件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.3.5" data-path="../../tools/12306-algorithm-web-js.html">
            
                <a href="../../tools/12306-algorithm-web-js.html">
            
                    
                    攻克 12306 前端加密算法
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.4" data-path="../../write/">
            
                <a href="../../write/">
            
                    
                    如何写作
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.4.1" data-path="../../write/markdownOrRichText.html">
            
                <a href="../../write/markdownOrRichText.html">
            
                    
                    markdown 和富文本
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4.2" data-path="../../write/markdown2richText.html">
            
                <a href="../../write/markdown2richText.html">
            
                    
                    markdown 转富文本
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4.3" data-path="../../write/static-semi-manual-with-csv.html">
            
                <a href="../../write/static-semi-manual-with-csv.html">
            
                    
                    csv 半手动数据统计
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4.4" data-path="../../write/static-semi-manual-with-js.html">
            
                <a href="../../write/static-semi-manual-with-js.html">
            
                    
                    js 半手动数据统计
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4.5" data-path="../../write/jianshu-optimize-static.html">
            
                <a href="../../write/jianshu-optimize-static.html">
            
                    
                    简述优选文章统计
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4.6" data-path="../../write/mermaid-flow-chart.html">
            
                <a href="../../write/mermaid-flow-chart.html">
            
                    
                    快速上手Mermaid流程图
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4.7" data-path="../../write/faq.html">
            
                <a href="../../write/faq.html">
            
                    
                    常见问题
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    

    
        
        <li class="header">读书观感</li>
        
        
    
        <li class="chapter " data-level="5.1" data-path="../../bigDataWave/">
            
                <a href="../../bigDataWave/">
            
                    
                    大数据浪潮之巅:新技术商业制胜之道
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">程序人生</li>
        
        
    
        <li class="chapter " data-level="6.1" data-path="../../todo/">
            
                <a href="../../todo/">
            
                    
                    待完成清单
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="6.1.1" data-path="../../todo/yarn-quickstart.html">
            
                <a href="../../todo/yarn-quickstart.html">
            
                    
                    yarn快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.2" data-path="../../todo/gulp-quickstart.html">
            
                <a href="../../todo/gulp-quickstart.html">
            
                    
                    gulp快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.3" data-path="../../todo/nvm-quickstart.html">
            
                <a href="../../todo/nvm-quickstart.html">
            
                    
                    nvm快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.4" data-path="../../todo/lodash-quickstart.html">
            
                <a href="../../todo/lodash-quickstart.html">
            
                    
                    lodash快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.5" data-path="../../todo/regexper-quickstart.html">
            
                <a href="../../todo/regexper-quickstart.html">
            
                    
                    regexper快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.6" data-path="../../todo/sublime-quickstart.html">
            
                <a href="../../todo/sublime-quickstart.html">
            
                    
                    sublime快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.7" data-path="../../todo/github-quickstart.html">
            
                <a href="../../todo/github-quickstart.html">
            
                    
                    github 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.8" data-path="../../todo/svn-quickstart.html">
            
                <a href="../../todo/svn-quickstart.html">
            
                    
                    svn 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.9" data-path="../../todo/java-quickstart.html">
            
                <a href="../../todo/java-quickstart.html">
            
                    
                    java 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.10" data-path="../../todo/mysql-quickstart.html">
            
                <a href="../../todo/mysql-quickstart.html">
            
                    
                    mysql 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.11" data-path="../../todo/maven-quickstart.html">
            
                <a href="../../todo/maven-quickstart.html">
            
                    
                    maven 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.12" data-path="../../todo/tomcat-quickstart.html">
            
                <a href="../../todo/tomcat-quickstart.html">
            
                    
                    tomcat 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.13" data-path="../../todo/gitignore-quickstart.html">
            
                <a href="../../todo/gitignore-quickstart.html">
            
                    
                    gitignore 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.14" data-path="../../todo/gitignore-as.html">
            
                <a href="../../todo/gitignore-as.html">
            
                    
                    android studio 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.15" data-path="../../todo/npm.html">
            
                <a href="../../todo/npm.html">
            
                    
                    npm 快速入门
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.1.16" data-path="../../todo/nginx.html">
            
                <a href="../../todo/nginx.html">
            
                    
                    nginx 快速入门
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="6.2" data-path="../../other/">
            
                <a href="../../other/">
            
                    
                    其他
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="6.2.1" data-path="../../other/dev-env-install.html">
            
                <a href="../../other/dev-env-install.html">
            
                    
                    重装开发环境
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.2" data-path="../../other/dingtalk-reminder.html">
            
                <a href="../../other/dingtalk-reminder.html">
            
                    
                    钉钉签到提醒
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.3" data-path="../../other/reminder.html">
            
                <a href="../../other/reminder.html">
            
                    
                    倒计时提醒
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.4" data-path="../../other/focus-website.html">
            
                <a href="../../other/focus-website.html">
            
                    
                    关注网站
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.5" data-path="../../other/transformation.html">
            
                <a href="../../other/transformation.html">
            
                    
                    转型之路
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.6" data-path="../../other/static.html">
            
                <a href="../../other/static.html">
            
                    
                    历史统计
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.7" data-path="../../other/me.html">
            
                <a href="../../other/me.html">
            
                    
                    关于作者
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="6.2.8" data-path="../../other/donate.html">
            
                <a href="../../other/donate.html">
            
                    
                    捐赠支持
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    

    
        
        <li class="header">开源项目</li>
        
        
    
        <li class="chapter " data-level="7.1" data-path="../../opensource/gitbook/">
            
                <a href="../../opensource/gitbook/">
            
                    
                    gitbook 插件项目
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="7.1.1" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-official/">
            
                    
                    gitbook-official
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.2" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-mygitalk/">
            
                    
                    gitbook-plugin-mygitalk
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.3" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-readmore/">
            
                    
                    gitbook-plugin-readmore
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.4" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-favicon-absolute/">
            
                    
                    gitbook-plugin-favicon-absolute
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.5" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-copyright/">
            
                    
                    gitbook-plugin-copyright
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.6" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-edit-link-plus/">
            
                    
                    gitbook-plugin-edit-link-plus
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.7" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-multilingual-index/">
            
                    
                    gitbook-plugin-multilingual-index
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.8" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-icp/">
            
                    
                    gitbook-plugin-icp
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.9" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-diff/">
            
                    
                    gitbook-plugin-diff
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.10" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-simple-mind-map/">
            
                    
                    gitbook-plugin-simple-mind-map
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.11" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-punctuation-converter/">
            
                    
                    gitbook-plugin-punctuation-converter
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.12" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-baidu-tongji-with-multiple-channel/">
            
                    
                    gitbook-plugin-baidu-tongji-with-multiple-channel
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.1.13" >
            
                <a target="_blank" href="https://xinwuyun.github.io/gitbook-plugin-google-tongji-with-multiple-channel/">
            
                    
                    gitbook-plugin-google-tongji-with-multiple-channel
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="7.2" data-path="../../opensource/hexo/">
            
                <a href="../../opensource/hexo/">
            
                    
                    hexo 插件项目
            
                </a>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="7.2.1" >
            
                <a target="_blank" href="https://xinwuyun.github.io/hexo-plugin-gitalk/">
            
                    
                    hexo-plugin-gitalk
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.2.2" >
            
                <a target="_blank" href="https://xinwuyun.github.io/hexo-plugin-readmore/">
            
                    
                    hexo-plugin-readmore
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="7.3" >
            
                <a target="_blank" href="https://security-plus.github.io/">
            
                    
                    security-plus
            
                </a>
            

            
        </li>
    

    

    <li class="divider"></li>

    <li>
        <a href="https://www.gitbook.com" target="_blank" class="gitbook-link">
            本书使用 GitBook 发布
        </a>
    </li>

    
    <li>
        &copy 2009-2021 xinwuyun.cn 版权所有 
        
        
            
        
        
            <a href="https://beian.miit.gov.cn/" target="_blank" class="gitbook-link">
                浙ICP备18042346号
            </a>
        
    </li>
    
</ul>

                </nav>
            
        
    </div>

    <div class="book-body">
        
            <div class="body-inner">
                
                    

<div class="book-header" role="navigation">
    

    <!-- Title -->
    <h1>
        <i class="fa fa-circle-o-notch fa-spin"></i>
        <a href="../.." >分支策略</a>
    </h1>
</div>




                    <div class="page-wrapper" tabindex="-1" role="main">
                        <div class="page-inner">
                            
<div class="search-plus" id="book-search-results">
    <div class="search-noresults">
    
                                <section class="normal markdown-section">
                                
                                <div id="anchor-navigation-ex-navbar"><i class="fa fa-navicon"></i><ul><li><span class="title-icon "></span><a href="#&#x5206;&#x652F;&#x7B56;&#x7565;"><b>1. </b>&#x5206;&#x652F;&#x7B56;&#x7565;</a></li><ul><li><span class="title-icon "></span><a href="#&#x9012;&#x5F52;&#x6A21;&#x5F0F;recursive"><b>1.1. </b>&#x9012;&#x5F52;&#x6A21;&#x5F0F;(recursive)</a></li><li><span class="title-icon "></span><a href="#&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;fast-forward"><b>1.2. </b>&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;(fast forward)</a></li><li><span class="title-icon "></span><a href="#&#x5206;&#x652F;&#x7B56;&#x7565;_1"><b>1.3. </b>&#x5206;&#x652F;&#x7B56;&#x7565;</a></li><li><span class="title-icon "></span><a href="#&#x5C0F;&#x7ED3;"><b>1.4. </b>&#x5C0F;&#x7ED3;</a></li></ul></ul></div><a href="#&#x5206;&#x652F;&#x7B56;&#x7565;" id="anchorNavigationExGoTop"><i class="fa fa-arrow-up"></i></a><h1 id="&#x5206;&#x652F;&#x7B56;&#x7565;"><a name="&#x5206;&#x652F;&#x7B56;&#x7565;" class="anchor-navigation-ex-anchor" href="#&#x5206;&#x652F;&#x7B56;&#x7565;"><i class="fa fa-link" aria-hidden="true"></i></a>1. &#x5206;&#x652F;&#x7B56;&#x7565;</h1>
<p>&#x9ED8;&#x8BA4;&#x60C5;&#x51B5;&#x4E0B;&#x5408;&#x5E76;&#x5206;&#x652F;&#x5E38;&#x5E38;&#x76F4;&#x63A5;&#x4F7F;&#x7528; <code>git merge</code> &#x547D;&#x4EE4;,&#x662F;&#x6700;&#x65B9;&#x4FBF;&#x5FEB;&#x901F;&#x7684;&#x5408;&#x5E76;&#x65B9;&#x6CD5;.&#x5176;&#x5B9E;&#x8FD9;&#x79CD;&#x60C5;&#x51B5;&#x4E0B; <code>git</code> &#x91C7;&#x7528;&#x7684;&#x662F; <code>fast forward</code> &#x6A21;&#x5F0F;,&#x7279;&#x70B9;&#x662F;&#x5220;&#x9664;&#x5206;&#x652F;&#x540E;,&#x4F1A;&#x4E22;&#x5931;&#x5206;&#x652F;&#x4FE1;&#x606F;,&#x597D;&#x50CF;&#x4ECE;&#x6765;&#x6CA1;&#x5B58;&#x5728;&#x8BE5;&#x5206;&#x652F;&#x4E00;&#x6837;,&#x800C;&#x6211;&#x4EEC;&#x63A8;&#x8350;&#x7684;&#x662F;<code>recursive</code> &#x6A21;&#x5F0F;,&#x80FD;&#x591F;&#x4FDD;&#x7559;&#x5206;&#x652F;&#x7684;&#x7248;&#x672C;&#x8BB0;&#x5F55;.</p>
<h2 id="&#x9012;&#x5F52;&#x6A21;&#x5F0F;recursive"><a name="&#x9012;&#x5F52;&#x6A21;&#x5F0F;recursive" class="anchor-navigation-ex-anchor" href="#&#x9012;&#x5F52;&#x6A21;&#x5F0F;recursive"><i class="fa fa-link" aria-hidden="true"></i></a>1.1. &#x9012;&#x5F52;&#x6A21;&#x5F0F;(recursive)</h2>
<p>&#x521B;&#x5EFA;&#x5E76;&#x5207;&#x6362; <code>dev</code> &#x5206;&#x652F;,&#x63D0;&#x4EA4;&#x7248;&#x672C;&#x540E;&#x5207;&#x6362;&#x56DE; <code>master</code> &#x5206;&#x652F;,&#x7136;&#x540E;&#x518D;&#x5408;&#x5E76; <code>dev</code> &#x5206;&#x652F;,&#x8FD9;&#x4E0D;&#x8FC7;&#x8FD9;&#x4E00;&#x6B21;&#x4E0D;&#x518D;&#x4F7F;&#x7528; <code>git merge dev</code> &#x547D;&#x4EE4;:</p>
<pre><code># &#x521B;&#x5EFA;&#x5E76;&#x5207;&#x6362; dev &#x5206;&#x652F;
$ git checkout -b dev
Switched to a new branch &apos;dev&apos;
# &#x63D0;&#x4EA4;&#x7248;&#x672C;
$ echo &quot;git checkout -b dev&quot; &gt;&gt; test.txt
$ git add test.txt
$ git commit -m &quot;git checkout -b dev&quot;
[dev 44d68f6] git checkout -b dev
 1 file changed, 1 insertion(+)
# &#x5207;&#x6362;&#x56DE; master &#x5206;&#x652F;
$ git checkout master
Switched to branch &apos;master&apos;
Your branch is ahead of &apos;origin/master&apos; by 6 commits.
  (use &quot;git push&quot; to publish your local commits)
$
</code></pre><p>&#x73B0;&#x5728;&#x6DFB;&#x52A0; <code>--no-ff</code> &#x53C2;&#x6570;&#x7981;&#x7528; <code>fast forward</code> &#x6A21;&#x5F0F;,&#x5373;<code>git merge --no-ff</code>:</p>
<pre><code>$ git merge --no-ff -m &quot;git merge --no-ff dev&quot; dev
Merge made by the &apos;recursive&apos; strategy.
 test.txt | 1 +
 1 file changed, 1 insertion(+)
$
</code></pre><p>&#x4E0A;&#x8FF0;&#x5185;&#x5BB9;&#x663E;&#x793A;,&#x8FD9;&#x6B21;&#x4F7F;&#x7528;&#x7684;&#x4E0D;&#x518D;&#x662F; <code>fast forward</code> &#x6A21;&#x5F0F;,&#x800C;&#x662F; <code>recursive</code> &#x6A21;&#x5F0F;,&#x90A3;&#x8BA9;&#x6211;&#x4EEC;&#x770B;&#x4E00;&#x4E0B;&#x63D0;&#x4EA4;&#x5386;&#x53F2;&#x6709;&#x4EC0;&#x4E48;&#x4E0D;&#x540C;&#x5427;!</p>
<pre><code>$ git log --pretty=oneline --graph
*   22fbef71b7575cd7eb7911079551618667f9f38f (HEAD -&gt; master) git merge --no-ff dev
|\  
| * 44d68f674bc85bc972426c572b78915e850e476c (dev) git checkout -b dev
|/  
*   3b8f434013caa8c27fade4c59d7aa2ee2c079636 fix conflict
|\  
| * 0fe95f871b371834d30ea17faa82f84b7d67672b git commit c2
* | 0949cc319e099d554795d03c69ee38923af00d6c git commit c3
|/  
* 5c482cd9965b9dfd4f273b43b240ed7db66167a8 git commit c1
* 413a4d1d2aab5ab85b6097d4b9f81cb5601c3b26 see https://xinwuyun.github.io/git/usage/branch-overview.html
* 9c30e50248b773e38b032477a859e87abe7c1bb0 learn git branch
* b3d8193bbcb9f76c47e831e3e212f2405ae09f93 (origin/master, origin/HEAD) see https://xinwuyun.github.io/git/usage/remote-repository.html
* 8e625640348a47ac922409a1ecb4c844385582aa add test.txt
* 9b196aab5bc87eeb11709c9eef35fca283e05c61 Initial commit
$
</code></pre><p><img src="../images/git-merge-no-ff.png" alt="git-merge-no-ff.png"></p>
<p>&#x8FD9;&#x79CD;&#x9012;&#x5F52;&#x6A21;&#x5F0F;(<code>recursive</code>) &#x6709;&#x4E00;&#x4E2A;&#x660E;&#x663E;&#x7684;&#x7279;&#x70B9;&#x5C31;&#x662F;&#x4F1A;&#x4EA7;&#x751F;&#x4E00;&#x4E2A;&#x65B0;&#x7684; <code>commit</code> ,&#x5E76;&#x4E0D;&#x4F1A;&#x50CF;&#x4E4B;&#x524D;&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;(<code>fast forward</code>)&#x90A3;&#x6837;&#x5355;&#x7EAF;&#x66F4;&#x6539; <code>HEAD</code> &#x7684;&#x6307;&#x5411;.</p>
<p>&#x79C9;&#x627F;&#x7740;&#x9605;&#x540E;&#x5373;&#x711A;&#x7684;&#x4E60;&#x60EF;,&#x5206;&#x652F;&#x4E00;&#x65E6;&#x5408;&#x5E76;&#x540E;&#x5C31;&#x7ACB;&#x5373;&#x5220;&#x9664;,&#x73B0;&#x5728;&#x5220;&#x9664; <code>dev</code> &#x5206;&#x652F;,&#x770B;&#x4E00;&#x4E0B;&#x4F1A;&#x53D1;&#x751F;&#x4EC0;&#x4E48;:</p>
<pre><code># &#x5220;&#x9664; dev &#x5206;&#x652F;
$ git branch -d dev
Deleted branch dev (was 44d68f6).
# &#x67E5;&#x770B;&#x63D0;&#x4EA4;&#x5386;&#x53F2;
$ git log --pretty=oneline --graph
*   22fbef71b7575cd7eb7911079551618667f9f38f (HEAD -&gt; master) git merge --no-ff dev
|\  
| * 44d68f674bc85bc972426c572b78915e850e476c git checkout -b dev
|/  
*   3b8f434013caa8c27fade4c59d7aa2ee2c079636 fix conflict
|\  
| * 0fe95f871b371834d30ea17faa82f84b7d67672b git commit c2
* | 0949cc319e099d554795d03c69ee38923af00d6c git commit c3
|/  
* 5c482cd9965b9dfd4f273b43b240ed7db66167a8 git commit c1
* 413a4d1d2aab5ab85b6097d4b9f81cb5601c3b26 see https://xinwuyun.github.io/git/usage/branch-overview.html
* 9c30e50248b773e38b032477a859e87abe7c1bb0 learn git branch
* b3d8193bbcb9f76c47e831e3e212f2405ae09f93 (origin/master, origin/HEAD) see https://xinwuyun.github.io/git/usage/remote-repository.html
* 8e625640348a47ac922409a1ecb4c844385582aa add test.txt
* 9b196aab5bc87eeb11709c9eef35fca283e05c61 Initial commit
$
</code></pre><p><img src="../images/git-merge-no-ff-dev.png" alt="git-merge-no-ff-dev.png"></p>
<p>&#x7531;&#x6B64;&#x53EF;&#x89C1;,&#x5220;&#x9664; <code>dev</code> &#x5206;&#x652F;&#x540E;&#x4EC5;&#x4EC5;&#x5C11;&#x4E86; <code>dev</code> &#x7684;&#x5F15;&#x7528;&#x800C;&#x5DF2;,&#x539F;&#x6765; <code>dev</code> &#x5206;&#x652F;&#x6240;&#x505A;&#x7684;&#x66F4;&#x6539;&#x5168;&#x90E8;&#x4FDD;&#x7559;&#x4E0B;&#x6765;&#x4E86;!</p>
<h2 id="&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;fast-forward"><a name="&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;fast-forward" class="anchor-navigation-ex-anchor" href="#&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;fast-forward"><i class="fa fa-link" aria-hidden="true"></i></a>1.2. &#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;(fast forward)</h2>
<p>&#x521B;&#x5EFA;&#x5E76;&#x5207;&#x6362; <code>dev</code> &#x5206;&#x652F;,&#x63D0;&#x4EA4;&#x7248;&#x672C;&#x540E;&#x5207;&#x6362;&#x56DE; <code>master</code> &#x5206;&#x652F;,&#x7136;&#x540E;&#x518D;&#x5408;&#x5E76; <code>dev</code> &#x5206;&#x652F;,&#x4F7F;&#x7528; <code>git merge dev</code> &#x547D;&#x4EE4;:</p>
<pre><code># &#x521B;&#x5EFA;&#x5E76;&#x5207;&#x6362; dev &#x5206;&#x652F;
$ git checkout -b dev
Switched to a new branch &apos;dev&apos;
# &#x63D0;&#x4EA4;&#x7248;&#x672C;
$ echo &quot;fast forward&quot; &gt;&gt; test.txt
$ git add test.txt
$ git commit -m &quot;fast forward&quot;
[dev 3fe94c0] fast forward
 1 file changed, 1 insertion(+)
$
</code></pre><p>&#x73B0;&#x5728;&#x5207;&#x6362;&#x56DE; <code>master</code> &#x5206;&#x652F;,&#x91C7;&#x7528;&#x9ED8;&#x8BA4;&#x7684;<code>git merge</code> &#x547D;&#x4EE4;&#x5408;&#x5E76; <code>dev</code> &#x5206;&#x652F;:</p>
<pre><code>$ git checkout master
Switched to branch &apos;master&apos;
Your branch is ahead of &apos;origin/master&apos; by 8 commits.
  (use &quot;git push&quot; to publish your local commits)
sunpodeMacBook-Pro:git-demo sunpo$ git merge dev
Updating 22fbef7..3fe94c0
Fast-forward
 test.txt | 1 +
 1 file changed, 1 insertion(+)
$
</code></pre><p>&#x4E0A;&#x8FF0;&#x5185;&#x5BB9;&#x663E;&#x793A;&#x8FD9;&#x6B21;&#x5408;&#x5E76;&#x91C7;&#x7528;&#x7684;&#x662F;&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;(<code>fast forward</code>),&#x8BA9;&#x6211;&#x4EEC;&#x770B;&#x4E00;&#x4E0B;&#x63D0;&#x4EA4;&#x5386;&#x53F2;:</p>
<pre><code>$ git log --pretty=oneline --graph
* 3fe94c0088cae526eda1fb2ffa303001b1eb42ba (HEAD -&gt; master, dev) fast forward
*   22fbef71b7575cd7eb7911079551618667f9f38f git merge --no-ff dev
|\  
| * 44d68f674bc85bc972426c572b78915e850e476c git checkout -b dev
|/  
*   3b8f434013caa8c27fade4c59d7aa2ee2c079636 fix conflict
|\  
| * 0fe95f871b371834d30ea17faa82f84b7d67672b git commit c2
* | 0949cc319e099d554795d03c69ee38923af00d6c git commit c3
|/  
* 5c482cd9965b9dfd4f273b43b240ed7db66167a8 git commit c1
* 413a4d1d2aab5ab85b6097d4b9f81cb5601c3b26 see https://xinwuyun.github.io/git/usage/branch-overview.html
* 9c30e50248b773e38b032477a859e87abe7c1bb0 learn git branch
* b3d8193bbcb9f76c47e831e3e212f2405ae09f93 (origin/master, origin/HEAD) see https://xinwuyun.github.io/git/usage/remote-repository.html
* 8e625640348a47ac922409a1ecb4c844385582aa add test.txt
* 9b196aab5bc87eeb11709c9eef35fca283e05c61 Initial commit
$
</code></pre><p>&#x4E0A;&#x8FF0;&#x5185;&#x5BB9;&#x8868;&#x660E;,&#x6B64;&#x6B21;&#x5408;&#x5E76;&#x5E76;&#x6CA1;&#x6709;&#x4EA7;&#x751F;&#x65B0;&#x7684; <code>commit</code> ,&#x53EA;&#x662F;&#x66F4;&#x6539;&#x4E0B; <code>HEAD</code> &#x6307;&#x5411;&#x800C;&#x5DF2;(<code>HEAD -&gt; master, dev</code>).</p>
<p><img src="../images/git-merge-ff-dev.png" alt="git-merge-ff-dev.png"></p>
<p>&#x540C;&#x6837;,&#x73B0;&#x5728;&#x5220;&#x9664; <code>dev</code> &#x5206;&#x652F;,&#x518D;&#x770B;&#x4E00;&#x4E0B;&#x63D0;&#x4EA4;&#x5386;&#x53F2;:</p>
<pre><code># &#x5220;&#x9664; dev &#x5206;&#x652F;
$ git branch -d dev
Deleted branch dev (was 3fe94c0).
# &#x67E5;&#x770B;&#x63D0;&#x4EA4;&#x5386;&#x53F2;
$ git log --pretty=oneline --graph
* 3fe94c0088cae526eda1fb2ffa303001b1eb42ba (HEAD -&gt; master) fast forward
*   22fbef71b7575cd7eb7911079551618667f9f38f git merge --no-ff dev
|\  
| * 44d68f674bc85bc972426c572b78915e850e476c git checkout -b dev
|/  
*   3b8f434013caa8c27fade4c59d7aa2ee2c079636 fix conflict
|\  
| * 0fe95f871b371834d30ea17faa82f84b7d67672b git commit c2
* | 0949cc319e099d554795d03c69ee38923af00d6c git commit c3
|/  
* 5c482cd9965b9dfd4f273b43b240ed7db66167a8 git commit c1
* 413a4d1d2aab5ab85b6097d4b9f81cb5601c3b26 see https://xinwuyun.github.io/git/usage/branch-overview.html
* 9c30e50248b773e38b032477a859e87abe7c1bb0 learn git branch
* b3d8193bbcb9f76c47e831e3e212f2405ae09f93 (origin/master, origin/HEAD) see https://xinwuyun.github.io/git/usage/remote-repository.html
* 8e625640348a47ac922409a1ecb4c844385582aa add test.txt
* 9b196aab5bc87eeb11709c9eef35fca283e05c61 Initial commit
$
</code></pre><p><img src="../images/git-merge-ff-dev-deleted.png" alt="git-merge-ff-dev-deleted.png"></p>
<p>&#x7531;&#x6B64;&#x53EF;&#x89C1;,&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;&#x4E00;&#x65E6;&#x5220;&#x9664;&#x5206;&#x652F;&#x540E;&#x5C31;&#x5F7B;&#x5E95;&#x4E22;&#x5931;&#x4E86;&#x5206;&#x652F;&#x7684;&#x4FE1;&#x606F;,&#x5373;&#x4FBF;&#x662F;&#x4ECE;&#x63D0;&#x4EA4;&#x5386;&#x53F2;&#x4E2D;&#x4E5F;&#x627E;&#x4E0D;&#x5230;&#x66FE;&#x7ECF;&#x5B58;&#x5728;&#x7684;&#x75D5;&#x8FF9;!</p>
<h2 id="&#x5206;&#x652F;&#x7B56;&#x7565;_1"><a name="&#x5206;&#x652F;&#x7B56;&#x7565;_1" class="anchor-navigation-ex-anchor" href="#&#x5206;&#x652F;&#x7B56;&#x7565;_1"><i class="fa fa-link" aria-hidden="true"></i></a>1.3. &#x5206;&#x652F;&#x7B56;&#x7565;</h2>
<p><code>git</code> &#x662F;&#x5206;&#x5E03;&#x5F0F;&#x7248;&#x672C;&#x63A7;&#x5236;&#x7CFB;&#x7EDF;,&#x540C;&#x65F6;&#x9F13;&#x52B1;&#x5927;&#x91CF;&#x4F7F;&#x7528;&#x5206;&#x652F;,&#x5982;&#x6B64;&#x4E00;&#x6765;&#x5927;&#x91CF;&#x7684;&#x5206;&#x652F;&#x8BE5;&#x5982;&#x4F55;&#x7BA1;&#x7406;?
&#x5B9E;&#x9645;&#x5F00;&#x53D1;&#x4E2D;,&#x5EFA;&#x8BAE;&#x51C6;&#x4ECE;&#x4EE5;&#x4E0B;&#x539F;&#x5219;&#x8FDB;&#x884C;&#x5206;&#x652F;&#x7BA1;&#x7406;:</p>
<ul>
<li><code>master</code> &#x5206;&#x652F;&#x4F5C;&#x4E3A;&#x4E3B;&#x5E72;&#x5206;&#x652F;,&#x8D1F;&#x8D23;&#x5BF9;&#x5916;&#x63D0;&#x4F9B;&#x670D;&#x52A1;,&#x8981;&#x6C42;&#x7A33;&#x5B9A;&#x53EF;&#x9760;,&#x56E0;&#x4E3A;&#x5E94;&#x8BE5;&#x4E13;&#x4EBA;&#x8D1F;&#x8D23;&#x66F4;&#x65B0;&#x7EF4;&#x62A4;.</li>
<li><code>dev</code> &#x5206;&#x652F;&#x4F5C;&#x4E3A;&#x5F00;&#x53D1;&#x5206;&#x652F;,&#x53D6;&#x4EE3; <code>master</code> &#x5206;&#x652F;&#x7684;&#x5F00;&#x53D1;&#x5730;&#x4F4D;,&#x79EF;&#x7D2F;&#x5230;&#x4E00;&#x5B9A;&#x4EA7;&#x51FA;&#x65F6;&#x518D;&#x5408;&#x5E76;&#x5230; <code>master</code> &#x5206;&#x652F;.</li>
<li><code>feature</code> &#x5206;&#x652F;&#x4F5C;&#x4E3A;&#x65B0;&#x529F;&#x80FD;&#x5206;&#x652F;,&#x6839;&#x636E;&#x5B9E;&#x9645;&#x60C5;&#x51B5;&#x52A8;&#x6001;&#x521B;&#x5EFA;,&#x5220;&#x9664;&#x5206;&#x652F;,&#x5E76;&#x9002;&#x65F6;&#x5408;&#x5E76;&#x5230; <code>dev</code> &#x5206;&#x652F;.</li>
<li><code>bugFixed</code> &#x5206;&#x652F;&#x4F5C;&#x4E3A;&#x4FEE;&#x590D;&#x7279;&#x5B9A; bug &#x5206;&#x652F;,&#x53EF;&#x80FD;&#x7531; <code>master</code> &#x5206;&#x652F;&#x884D;&#x751F;&#x800C;&#x6765;,&#x4E5F;&#x53EF;&#x80FD;&#x7531; <code>dev</code> &#x5206;&#x652F;&#x884D;&#x751F;&#x7B49;&#x7B49;,&#x4FEE;&#x590D;&#x540E;&#x53CA;&#x65F6;&#x5408;&#x5E76;&#x5230;&#x539F;&#x5206;&#x652F;.</li>
<li><code>custom</code> &#x81EA;&#x5B9A;&#x4E49;&#x5206;&#x652F;,&#x9879;&#x76EE;&#x6210;&#x5458;&#x79C1;&#x6709;&#x5206;&#x652F;,&#x7531;&#x4E0A;&#x7EA7;&#x9886;&#x5BFC;&#x5206;&#x914D;&#x4EFB;&#x52A1;&#x540E;&#x5404;&#x5F00;&#x53D1;&#x4EBA;&#x5458;&#x81EA;&#x884C;&#x9009;&#x62E9;&#x521B;&#x5EFA;&#x81EA;&#x5DF1;&#x7684;&#x5206;&#x652F;,&#x5E76;&#x6839;&#x636E;&#x5B9E;&#x9645;&#x60C5;&#x51B5;&#x51B3;&#x5B9A;&#x5408;&#x5E76;&#x5230; <code>dev</code> &#x5206;&#x652F;&#x6216; <code>feature</code> &#x7B49;&#x5206;&#x652F;.</li>
</ul>
<p><img src="../images/git-strategy.png" alt="git-strategy.png"></p>
<h2 id="&#x5C0F;&#x7ED3;"><a name="&#x5C0F;&#x7ED3;" class="anchor-navigation-ex-anchor" href="#&#x5C0F;&#x7ED3;"><i class="fa fa-link" aria-hidden="true"></i></a>1.4. &#x5C0F;&#x7ED3;</h2>
<ul>
<li>&#x5FEB;&#x901F;&#x524D;&#x8FDB;&#x6A21;&#x5F0F;(<code>git merge &lt;name&gt;</code>)&#x4E0D;&#x4FDD;&#x7559;&#x5206;&#x652F;&#x5408;&#x5E76;&#x5386;&#x53F2;,&#x9012;&#x5F52;&#x6A21;&#x5F0F;(<code>git merge --no-ff -m &lt;remark&gt; &lt;name&gt;</code>)&#x4FDD;&#x7559;&#x5206;&#x652F;&#x5408;&#x5E76;&#x5386;&#x53F2;.</li>
<li>&#x5236;&#x5B9A;&#x5927;&#x5BB6;&#x90FD;&#x8BA4;&#x540C;&#x7684;&#x5206;&#x652F;&#x7BA1;&#x7406;&#x539F;&#x5219;,&#x5E76;&#x4E25;&#x683C;&#x51C6;&#x5B88;&#x89C4;&#x5219;.</li>
</ul>
<script type="text/javascript">var targetUl = document.getElementsByClassName('page-inner')[0].getElementsByTagName('ul')[0];if(targetUl.getElementsByTagName('a').length>0){targetUl.className='toc';}</script>

<pre><code class="lang-html">&#x4F5C;&#x8005;: &#x96EA;&#x4E4B;&#x68A6;
&#x94FE;&#x63A5;: https://xinwuyun.github.io/git/usage/branch-strategy.html
&#x6765;&#x6E90;: &#x96EA;&#x4E4B;&#x68A6;
&#x672C;&#x6587;&#x539F;&#x521B;&#x53D1;&#x5E03;&#x4E8E;&#x300C;&#x96EA;&#x4E4B;&#x68A6;&#x300D;,&#x8F6C;&#x8F7D;&#x8BF7;&#x6CE8;&#x660E;&#x51FA;&#x5904;,&#x8C22;&#x8C22;&#x5408;&#x4F5C;!
</code></pre>
<p><img src="https://xinwuyun.github.io/xinwuyun-wechat-open.png" alt="https://xinwuyun.github.io/xinwuyun-wechat-open.png"></p>
<div id="gitalk-container"></div> 

<footer class="page-footer">
&#xA9; 2009-2021 xinwuyun.cn &#x7248;&#x6743;&#x6240;&#x6709; <a href="https://beian.miit.gov.cn/" target="_blank">&#x6D59;ICP&#x5907;18042346&#x53F7;</a>
</footer>
                                
                                </section>
                            
    </div>
    <div class="search-results">
        <div class="has-results">
            
            <h1 class="search-results-title"><span class='search-results-count'></span> results matching "<span class='search-query'></span>"</h1>
            <ul class="search-results-list"></ul>
            
        </div>
        <div class="no-results">
            
            <h1 class="search-results-title">No results matching "<span class='search-query'></span>"</h1>
            
        </div>
    </div>
</div>

                        </div>
                    </div>
                
            </div>

            
                
                <a href="branch-merge-with-conflict.html" class="navigation navigation-prev " aria-label="Previous page: 冲突合并">
                    <i class="fa fa-angle-left"></i>
                </a>
                
                
                <a href="branch-emergency-fixbug.html" class="navigation navigation-next " aria-label="Next page: 紧急修复">
                    <i class="fa fa-angle-right"></i>
                </a>
                
            
        
    </div>

    <script>
        var gitbook = gitbook || [];
        gitbook.push(function() {
            gitbook.page.hasChanged({"page":{"title":"分支策略","level":"2.2.2.9.3","depth":4,"next":{"title":"紧急修复","level":"2.2.2.9.4","depth":4,"path":"git/usage/branch-emergency-fixbug.md","ref":"git/usage/branch-emergency-fixbug.md","articles":[]},"previous":{"title":"冲突合并","level":"2.2.2.9.2","depth":4,"path":"git/usage/branch-merge-with-conflict.md","ref":"git/usage/branch-merge-with-conflict.md","articles":[]},"dir":"ltr"},"config":{"plugins":["toc","-lunr","-search","search-plus","splitter","-sharing","sharing-plus","expandable-chapters-small","anchor-navigation-ex","edit-link-plus","code","chart","favicon-absolute","github-buttons","advanced-emoji","rss","sitemap-general","copyright","mygitalk","donate","icp","diff","simple-mind-map","hide-element","audio_image","mermaid-gb3","baidu-tongji-with-multiple-channel","google-tongji-with-multiple-channel"],"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"pluginsConfig":{"diff":{"type":"markdown","method":"diffChars","options":{}},"baidu-tongji-with-multiple-channel":{"url":"https://hm.baidu.com/hm.js","multipleChannelConfig":{"localhost":{"token":"5273b2f99de3bc190886abb53f62267e"},"xinwuyun.tech":{"token":"468a97b20b79bc025d27afbee73d2f39"},"blog.xinwuyun.cn":{"token":"606f5db455f771889dcfd16bb2bd313b"},"xinwuyun.github.io":{"token":"5273b2f99de3bc190886abb53f62267e"},"xinwuyun.gitee.io":{"token":"60ec676f32be4579eb53a430e153f677"},"xinwuyun.gitlab.io":{"token":"187a0e5601c4e4987cdb5b8df09c9b21"},"xinwuyun.gitbook.io":{"token":"6e2ee1b7bea146b2d6d9382bbf803083"}}},"splitter":{},"google-tongji-with-multiple-channel":{"multipleChannelConfig":{"localhost":{"token":"UA-140787039-2"},"xinwuyun.gitbook.io":{"token":"UA-140787039-1"},"xinwuyun.github.io":{"token":"UA-140787039-2"},"xinwuyun.gitee.io":{"token":"UA-140787039-3"},"xinwuyun.gitlab.io":{"token":"UA-140787039-4"},"xinwuyun.tech":{"token":"UA-140787039-5"},"blog.xinwuyun.cn":{"token":"UA-140787039-6"}},"url":"https://www.googletagmanager.com/gtag/js"},"copyright":{"copyProtect":false,"site":"https://xinwuyun.github.io/","author":"雪之梦","website":"雪之梦","image":"https://xinwuyun.github.io/xinwuyun-wechat-open.png"},"toc":{"addClass":true,"className":"toc"},"edit-link-plus":{"label":"编辑本页","base":{"xinwuyun.github.io":"https://github.com/xinwuyun/xinwuyun.github.io/edit/master","xinwuyun.gitlab.io":"https://gitlab.com/xinwuyun/xinwuyun.gitlab.io/edit/master","xinwuyun.gitee.io":"https://gitee.com/xinwuyun/xinwuyun/edit/master"},"defaultBase":"https://github.com/xinwuyun/xinwuyun.github.io/edit/master"},"sharing-plus":{"qq":false,"all":["facebook","google","twitter","instapaper","linkedin","pocket","stumbleupon"],"douban":false,"facebook":true,"weibo":false,"instapaper":false,"whatsapp":false,"hatenaBookmark":false,"twitter":true,"messenger":false,"line":false,"vk":false,"pocket":true,"google":false,"viber":false,"stumbleupon":false,"qzone":false,"linkedin":false},"code":{"copyButtons":true},"donate":{"title":"","button":"赏","wechat":"/wechat.jpg","alipay":"/alipay.jpg","wechatText":"微信","alipayText":"支付宝"},"favicon-absolute":{"favicon":"/favicon.ico","appleTouchIconPrecomposed152":"/apple-touch-icon-precomposed-152.png","appleTouchIconMore":{},"appleTouchIconPrecomposedMore":{}},"sitemap-general":{"prefix":"https://xinwuyun.github.io/"},"hide-element":{"elements":["a.gitbook-link[href='https://www.gitbook.com']"]},"fontsettings":{"theme":"white","family":"sans","size":2},"rss":{"categories":["markdown","git","github","gitbook","java","php"],"title":"雪之梦","description":"雪之梦静态网站,源码托管于 https://github.com/xinwuyun/xinwuyun.github.io","author":"xinwuyun","site_url":"https://xinwuyun.github.io/","feed_url":"https://xinwuyun.github.io/rss","managingEditor":"zrwangxdu@outlook.com","webMaster":"zrwangxdu@outlook.com"},"audio_image":{},"highlight":{},"mermaid-gb3":{},"anchor-navigation-ex":{"showLevel":true,"associatedWithSummary":true,"mode":"float","showGoTop":true,"printLog":false,"multipleH1":true,"float":{"floatIcon":"fa fa-navicon","showLevelIcon":false,"level1Icon":"","level2Icon":"","level3Icon":""},"pageTop":{"showLevelIcon":false,"level1Icon":"","level2Icon":"","level3Icon":""}},"icp":{"link":"https://beian.miit.gov.cn/","style":{},"label":"&copy 2009-2021 xinwuyun.cn 版权所有 ","number":"浙ICP备18042346号"},"github-buttons":{"buttons":[{"user":"xinwuyun","repo":"xinwuyun.github.io","type":"star","size":"small"}]},"expandable-chapters-small":{},"mygitalk":{"flipMoveOptions":{},"clientID":"3f62415a283d19cbd696","number":-1,"perPage":10,"proxy":"https://cors-anywhere.herokuapp.com/https://github.com/login/oauth/access_token","admin":["xinwuyun"],"createIssueManually":false,"distractionFreeMode":false,"repo":"xinwuyun.github.io","owner":"xinwuyun","enableHotKey":true,"clientSecret":"aed0e1db0620bf5d0e3a3f0225f801997ad74e58","pagerDirection":"last","labels":["Gitalk"]},"advanced-emoji":{"embedEmojis":false},"sharing":{"qq":true,"all":["facebook","google","twitter","weibo","instapaper","linkedin","pocket","stumbleupon"],"douban":true,"facebook":false,"weibo":true,"instapaper":false,"whatsapp":false,"hatenaBookmark":false,"twitter":false,"messenger":false,"line":false,"vk":false,"pocket":false,"google":false,"viber":false,"stumbleupon":false,"qzone":true,"linkedin":false},"simple-mind-map":{"type":"markdown","preset":"colorful","linkShape":"diagonal","autoFit":true,"style":{}},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"chart":{"type":"c3"},"search-plus":{}},"theme":"default","author":"xinwuyun","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"title":"雪之梦","language":"zh-hans","links":{"sidebar":{"技术博客":"https://blog.xinwuyun.cn/"}},"gitbook":"3.2.3","description":"雪之梦,xinwuyun 搭建的 Gitbook 个人博客,详情请访问 https://xinwuyun.github.io/"},"file":{"path":"git/usage/branch-strategy.md","mtime":"2020-09-05T14:33:57.782Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2022-02-02T12:37:44.450Z"},"basePath":"../..","book":{"language":""}});
        });
    </script>
</div>

        
    
    <script src="../../gitbook/gitbook.js"></script>
    <script src="../../gitbook/theme.js"></script>
    
        
        <script src="../../gitbook/gitbook-plugin-search-plus/jquery.mark.min.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-search-plus/search.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-splitter/splitter.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-sharing-plus/buttons.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-expandable-chapters-small/expandable-chapters-small.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-edit-link-plus/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-code/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-github-buttons/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-rss/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-copyright/plugin.js"></script>
        
    
        
        <script src="https://cdn.bootcss.com/blueimp-md5/2.12.0/js/md5.min.js"></script>
        
    
        
        <script src="https://unpkg.com/gitalk/dist/gitalk.min.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-mygitalk/mygitalk.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-donate/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-simple-mind-map/bundle.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-hide-element/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-mermaid-gb3/book/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-baidu-tongji-with-multiple-channel/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-google-tongji-with-multiple-channel/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-fontsettings/fontsettings.js"></script>
        
    

    <script src="../../gitbook/gitbook-plugin-mermaid-gb3/mermaid/mermaid.min.js"></script>

    </body>
</html>

